Fix #206, updating sample_app to use new versioning system. #226

dzbaker · 2023-12-26T16:26:18Z

Describe the contribution
Fixes #206.

Testing performed
Workflows were run.

Expected behavior changes
No behavior changes, however the following changes were made to the versioning system:

Build Baseline is set to "equuleus-rc1"
Mission Revision is set to to 00
"SAMPLE_APP_BUILD_DEV_CYCLE" macro has been defined
Version String has been removed, and all references to it replaced with the Build Baseline/Codename

System(s) tested on
Ubuntu 20.04

Contributor Info - All information REQUIRED for consideration of pull request
Dylan Z. Baker/NASA GSFC

dzbaker · 2024-01-11T19:31:10Z

fsw/src/sample_app_version.h

@@ -38,14 +40,19 @@
 #define SAMPLE_APP_MINOR_VERSION 1  /*!< @brief Minor version number. */
 #define SAMPLE_APP_REVISION      99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/


REVISION should be 0 instead of MISSION_REV being 00. Can use to set version string to development vs release.

*Combines:* sample_app equuleus-rc1+dev36 sch_lab equuleus-rc1+dev29 to_lab equuleus-rc1+dev38 sample_lib equuleus-rc1+dev2 tblCRCTool equuleus-rc1+dev2 cFS-GroundSystem equuleus-rc1+dev2 elf2cfetbl equuleus-rc1+dev10 cFE equuleus-rc1+dev75 PSP equuleus-rc1+dev38 osal equuleus-rc1+dev33 **Includes:** *sample_app* - nasa/sample_app#226 *sch_lab* - nasa/sch_lab#161 *to_lab* - nasa/sch_lab#186 *sample_lib* - nasa/sample_lib#96 *tblCRCTool* - nasa/tblCRCTool#80 *cFS-GroundSystem* - nasa/cFS-GroundSystem#239 *elf2cfetbl* - nasa/elf2cfetbl#144 - nasa/elf2cfetbl#143 *cFE* - nasa/cFE#2463 - nasa/cFE#2486 - nasa/cFE#2485 - nasa/cFE#2489 *PSP* - nasa/PSP#422 - nasa/PSP#427 *osal* - nasa/osal#1437 - nasa/osal#1442 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>

dzbaker force-pushed the fix-206 branch 2 times, most recently from 9887a7a to 1cb848e Compare December 26, 2023 17:17

dzbaker commented Jan 11, 2024

View reviewed changes

dzbaker added the CCB:Provisionally-Approved label Jan 11, 2024

Fix nasa#206, updating sample_app to use new versioning system.

a4f544b

dzbaker force-pushed the fix-206 branch from 1cb848e to a4f544b Compare January 17, 2024 14:01

dzbaker added CCB:Approved Indicates code approval by CCB and removed CCB:Provisionally-Approved labels Jan 17, 2024

dzbaker mentioned this pull request Jan 17, 2024

sample_app Integration candidate: Equuleus-rc1+dev1 #227

Merged

2 tasks

dzbaker mentioned this pull request Jan 17, 2024

IC: equuleus-rc1+dev1 nasa/cFS#731

Merged

2 tasks

dzbaker merged commit 21ff73e into nasa:main Jan 18, 2024
7 of 9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #206, updating sample_app to use new versioning system. #226

Fix #206, updating sample_app to use new versioning system. #226

dzbaker commented Dec 26, 2023

dzbaker Jan 11, 2024

		@@ -38,14 +40,19 @@
		#define SAMPLE_APP_MINOR_VERSION 1 /!< @brief Minor version number. /
		#define SAMPLE_APP_REVISION 99 /!< @brief Revision version number. Value of 99 indicates a development version./

Fix #206, updating sample_app to use new versioning system. #226

Fix #206, updating sample_app to use new versioning system. #226

Conversation

dzbaker commented Dec 26, 2023

dzbaker Jan 11, 2024

Choose a reason for hiding this comment